Richfr/ Add windowsAddress support to WslcCreateContainer() API by 1wizkid · Pull Request #40037 · microsoft/WSL

1wizkid · 2026-03-30T16:38:16Z

Summary of the Pull Request

PR Checklist

Closes: Link to issue #xxx
Communication: I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected
Tests: Added/updated if needed and all pass
Localization: All end user facing strings can be localized
Dev docs: Added/updated if needed
Documentation updated: If checked, please file a pull request on our docs repo and link it here: #xxx

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

Copilot

Pull request overview

This PR updates the WSLC Client SDK’s container port-mapping path to support custom host binding addresses (including IPv6) instead of always binding to 127.0.0.1, and relaxes/updates validation around the windowsAddress field.

Changes:

Convert windowsAddress (IPv4/IPv6) into a string binding address for WSLCPortMapping during container creation.
Add input validation for windowsAddress->ss_family in WslcSetContainerSettingsPortMappings.

src/windows/WslcSDK/wslcsdk.cpp

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 4 comments.

src/windows/WslcSDK/wslcsdk.cpp

Copilot

Pull request overview

Copilot reviewed 1 out of 1 changed files in this pull request and generated 6 comments.

src/windows/WslcSDK/wslcsdk.cpp

JohnMcPMS

Almost certainly needs a test update to prevent a negative test from failing when it passes in an address. Not sure if we can expect IPv6 everywhere, but at least passing in 127.0.0.1 (or maybe IPv6 loopback works even if no external IPv6 address is available?).

[Edit: Search suggests that IPv6 loopback is always available if device supports IPv6.]

OneBlue

Added a couple comments, I would also recommend:

Updating the pull request title
Adding test coverage for the binding address wiring (at least for localhost, since that's the only thing that the service supports today)

You'll probably have to update existing tests as well

src/windows/WslcSDK/wslcsdk.cpp

benhillis · 2026-04-07T02:41:59Z

Hey @1wizkid 👋 — Following up on this PR. Currently the wslc tests are failing in CI, and there are 11 unresolved review threads with feedback from maintainers, including:

Missing test coverage
Dangling pointer concerns (flagged 4 times)
Wildcard port binding security concern
\E_UNEXPECTED\ error code usage
\AF_UNSPEC\ failure risk

Is this change still needed? The review feedback covers some important safety and design issues that should be addressed before this can move forward. Let us know if you need any help!

1wizkid · 2026-04-07T16:12:14Z

Ill focus on this today. Thanks, Richard Sent from my T-Mobile 5G Device Get Outlook for Android<https://aka.ms/AAb9ysg>

…

________________________________

Copilot

Copilot wasn't able to review any files in this pull request.

…ate windowAddress values if present.

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

…that convertedPorts must stay in same scope as containerOptions and moved the declaration to be with that var

Copilot

Pull request overview

Copilot reviewed 1 out of 3 changed files in this pull request and generated 3 comments.

src/windows/WslcSDK/wslcsdk.cpp

…for Ipv4 and Ipv6 local host.

…log reports easier.

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

1wizkid · 2026-04-08T01:35:01Z

The bulk of the issues addressed and new tests submitted as well that cover the usage of windowsAddress IPv4 & IPv6. Waiting for the test pass to complete and will see if anything left to do. Thanks, Richard

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

Copilot

Copilot encountered an error and was unable to review this pull request. You can try again by re-requesting a review.

1wizkid

Feedback incorporated

src/windows/WslcSDK/wslcsdk.cpp

OneBlue · 2026-04-08T23:27:09Z

src/windows/WslcSDK/wslcsdk.cpp

+HRESULT InetNtopToHresult(int af, const void* src, char* dst, size_t dstCount)
+{
+    const char* result = inet_ntop(af, src, dst, dstCount);
+    if (result)


I recommend throwing the win32 error directly:

THROW_WIN32_IF(WSAGetLastError(), inet_ntop(af, src, dst, dstCount) == nullptr);

OneBlue · 2026-04-08T23:28:06Z

src/windows/WslcSDK/wslcsdk.cpp

+
+                default:
+                    // Reject unsupported or malformed address families
+                    THROW_HR(E_INVALIDARG);


nit: I recommend logging the address family to make debugging easier

OneBlue · 2026-04-08T23:29:00Z

src/windows/WslcSDK/wslcsdk.cpp

+            // Validate IP address if provided and if valid, copy to runtime structure.
+            if (internalPort.windowsAddress != nullptr)
+            {
+                char addrBuf[INET6_ADDRSTRLEN]{};


Instead of having a temporary buffer, I recommend copying directly to convertedPort.BindingAddress

OneBlue · 2026-04-08T23:29:59Z

src/windows/WslcSDK/wslcsdk.cpp

+        if (portMappings[i].windowsAddress != nullptr)
+        {
+            const auto family = portMappings[i].windowsAddress->ss_family;
+            RETURN_HR_IF(E_INVALIDARG, family != AF_INET && family != AF_INET6);


nit: I recommend logging the invalid address family here

richfr added 2 commits March 30, 2026 09:21

Portmapping: add windowsAddress support

fe043b9

Portmapping: add windowsAddress support

04a4541

Copilot AI review requested due to automatic review settings March 30, 2026 16:38

Copilot started reviewing on behalf of 1wizkid March 30, 2026 16:39 View session

Copilot AI reviewed Mar 30, 2026

View reviewed changes

src/windows/WslcSDK/wslcsdk.cpp Outdated Show resolved Hide resolved

src/windows/WslcSDK/wslcsdk.cpp Show resolved Hide resolved

src/windows/WslcSDK/wslcsdk.cpp Show resolved Hide resolved

JohnMcPMS reviewed Mar 30, 2026

View reviewed changes

src/windows/WslcSDK/wslcsdk.cpp Outdated Show resolved Hide resolved

richfr added 2 commits April 1, 2026 09:32

Addressing PR feedback: update wslcsdk.cpp

cf34fb8

Addressing clang formatting error

954d1a0

Copilot AI review requested due to automatic review settings April 1, 2026 17:03

Copilot AI reviewed Apr 1, 2026

View reviewed changes

src/windows/WslcSDK/wslcsdk.cpp Show resolved Hide resolved

src/windows/WslcSDK/wslcsdk.cpp Show resolved Hide resolved

src/windows/WslcSDK/wslcsdk.cpp Show resolved Hide resolved

src/windows/WslcSDK/wslcsdk.cpp Outdated Show resolved Hide resolved

Copilot started reviewing on behalf of 1wizkid April 1, 2026 17:21 View session

richfr and others added 2 commits April 1, 2026 10:33

Providing default values for port bindings: wslcsdk.cpp

31e28b4

Merge branch 'feature/wsl-for-apps' into richfr/portmapping

7ca8e51

Copilot AI review requested due to automatic review settings April 1, 2026 17:58

1wizkid marked this pull request as ready for review April 1, 2026 18:00

1wizkid requested a review from a team as a code owner April 1, 2026 18:00

Copilot AI reviewed Apr 1, 2026

View reviewed changes

Copilot started reviewing on behalf of 1wizkid April 1, 2026 18:13 View session

Merge branch 'feature/wsl-for-apps' into richfr/portmapping

7f1eca4

1wizkid enabled auto-merge (squash) April 1, 2026 18:27

JohnMcPMS reviewed Apr 1, 2026

View reviewed changes

OneBlue requested changes Apr 1, 2026

View reviewed changes

src/windows/WslcSDK/wslcsdk.cpp Show resolved Hide resolved

src/windows/WslcSDK/wslcsdk.cpp Outdated Show resolved Hide resolved

Copilot AI review requested due to automatic review settings April 7, 2026 16:54

1wizkid closed this Apr 7, 2026

auto-merge was automatically disabled April 7, 2026 16:54
Pull request was closed

1wizkid force-pushed the richfr/portmapping branch from 7f1eca4 to 715ce52 Compare April 7, 2026 16:54

Copilot AI reviewed Apr 7, 2026

View reviewed changes

Fixed merge conflicts. Set default BindingAddress to 127.0.0.1. Valid…

eff50d2

…ate windowAddress values if present.

Copilot AI review requested due to automatic review settings April 7, 2026 17:19

Copilot started reviewing on behalf of 1wizkid April 7, 2026 17:20 View session

return family name if socket address is invalid

895a604

Copilot AI reviewed Apr 7, 2026

View reviewed changes

richfr added 2 commits April 7, 2026 10:55

Removed unnecessasry variable bindingAddressStrings. Also, commented …

a788da8

…that convertedPorts must stay in same scope as containerOptions and moved the declaration to be with that var

Fixed clang formatting errors

644ebab

Copilot AI review requested due to automatic review settings April 7, 2026 19:02

Copilot AI reviewed Apr 7, 2026

View reviewed changes

src/windows/WslcSDK/wslcsdk.cpp Outdated Show resolved Hide resolved

src/windows/WslcSDK/wslcsdk.cpp Outdated Show resolved Hide resolved

src/windows/WslcSDK/wslcsdk.cpp Show resolved Hide resolved

Copilot started reviewing on behalf of 1wizkid April 7, 2026 19:13 View session

richfr added 2 commits April 7, 2026 14:59

Added WSLC Sdk API tests for WslcContainerPortMapping.windowsAddress …

47c28f2

…for Ipv4 and Ipv6 local host.

Add unique name to containerSettings var to make test debugging from …

9ed0f18

…log reports easier.

Copilot AI review requested due to automatic review settings April 7, 2026 22:56

Copilot started reviewing on behalf of 1wizkid April 7, 2026 22:57 View session

Copilot AI reviewed Apr 7, 2026

View reviewed changes

Adjust AF_UNIX portmapping test so that it fails if value accepted

fb9c466

Return more accurate strncpy_s error result

13ba738

Copilot AI review requested due to automatic review settings April 8, 2026 02:28

Copilot started reviewing on behalf of 1wizkid April 8, 2026 02:29 View session

Improved error return value of IP address verification

e482e48

1wizkid changed the title ~~Richfr/portmapping~~ Richfr/ Add windowsAddress support to WslcCreateContainer() API Apr 8, 2026

Merge branch 'feature/wsl-for-apps' into richfr/portmapping

1e7656a

Copilot AI reviewed Apr 8, 2026

View reviewed changes

1wizkid added 2 commits April 8, 2026 08:56

Merge branch 'feature/wsl-for-apps' into richfr/portmapping

f4fd0ba

Merge branch 'feature/wsl-for-apps' into richfr/portmapping

45b6841

Copilot AI review requested due to automatic review settings April 8, 2026 18:07

Copilot started reviewing on behalf of 1wizkid April 8, 2026 18:09 View session

Copilot AI reviewed Apr 8, 2026

View reviewed changes

1wizkid commented Apr 8, 2026

View reviewed changes

OneBlue reviewed Apr 8, 2026

View reviewed changes

Conversation

1wizkid commented Mar 30, 2026

Summary of the Pull Request

PR Checklist

Detailed Description of the Pull Request / Additional comments

Validation Steps Performed

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JohnMcPMS left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

OneBlue left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

benhillis commented Apr 7, 2026

Uh oh!

1wizkid commented Apr 7, 2026 via email • edited by microsoft-github-policy-service bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

1wizkid commented Apr 8, 2026 via email • edited by microsoft-github-policy-service bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

1wizkid left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

JohnMcPMS left a comment •

edited

Loading

1wizkid commented Apr 7, 2026 via email •

edited by microsoft-github-policy-service bot

Loading

1wizkid commented Apr 8, 2026 via email •

edited by microsoft-github-policy-service bot

Loading